From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 May 2011 05:35:30 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~1554^2~15
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d2d818bf00fa3a3204abd9b31103cfca21ff8125;p=emacs.git

Merge from mainline.
---

d2d818bf00fa3a3204abd9b31103cfca21ff8125